From Olaf: Let IGC round when doing FP->int conversions. Regenerate IGC reference...

diff --git a/gpsbabel/igc.c b/gpsbabel/igc.c
index 33c1f22730d7e88bae0e47c2fd2b7d9415ec31f5..188e7d3783ee84dd1eb02bc159575145fc9b4543 100644 (file)
--- a/gpsbabel/igc.c
+++ b/gpsbabel/igc.c
@@ -518,8 +518,8 @@ static char *latlon2str(const waypoint * wpt)
     char lon_hemi = wpt->longitude < 0 ? 'W' : 'E';
     unsigned char lat_deg = fabs(wpt->latitude);
     unsigned char lon_deg = fabs(wpt->longitude);
-    unsigned int lat_min = rint((fabs(wpt->latitude) - lat_deg) * 60000);
-    unsigned int lon_min = rint((fabs(wpt->longitude) - lon_deg) * 60000);
+    unsigned int lat_min = (fabs(wpt->latitude) - lat_deg) * 60000 + 0.500000000001;
+    unsigned int lon_min = (fabs(wpt->longitude) - lon_deg) * 60000 + 0.500000000001;
 
     if (snprintf(str, 18, "%02u%05u%c%03u%05u%c",
                 lat_deg, lat_min, lat_hemi, lon_deg, lon_min, lon_hemi) != 17) {

diff --git a/gpsbabel/reference/igc1_3d.out b/gpsbabel/reference/igc1_3d.out
index 21ff7744a42b9ceb8c4649465717ed7927be7791..2ecdeb4e2f7e4a81be3e9759f51f7f9ad4b1c1b1 100644 (file)
--- a/gpsbabel/reference/igc1_3d.out
+++ b/gpsbabel/reference/igc1_3d.out
@@ -48,7 +48,7 @@ B0419123040526S15036253EA0090600000
 B0419433040646S15036334EA0090300000\r
 B0420133040794S15036367EA0089500000\r
 B0420443040707S15036367EA0090300000\r
-B0421143040678S15036423EA0092200000\r
+B0421143040679S15036423EA0092200000\r
 B0421443040658S15036414EA0091400000\r
 B0422153040772S15036358EA0091900000\r
 B0422453040722S15036423EA0096100000\r

diff --git a/gpsbabel/reference/igc1_gpx.out b/gpsbabel/reference/igc1_gpx.out
index c88087656f3b93aec80e8468b5cfc40a10f9775b..25c86bb95444fa0f5531eead08f9e96195e42916 100644 (file)
--- a/gpsbabel/reference/igc1_gpx.out
+++ b/gpsbabel/reference/igc1_gpx.out
@@ -157,7 +157,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 <trkpt lat="-30.678450" lon="150.606117">
 <time>2004-04-24T04:20:44Z</time>
 </trkpt>
-<trkpt lat="-30.677967" lon="150.607050">
+<trkpt lat="-30.677983" lon="150.607050">
 <time>2004-04-24T04:21:14Z</time>
 </trkpt>
 <trkpt lat="-30.677633" lon="150.606900">

diff --git a/gpsbabel/reference/igc1_igc.out b/gpsbabel/reference/igc1_igc.out
index beb86d8e28ac6cfdcd2e76dd9d20f841086e4a09..9d3c0071eab306f647bb946bf7bb2785a23b26db 100644 (file)
--- a/gpsbabel/reference/igc1_igc.out
+++ b/gpsbabel/reference/igc1_igc.out
@@ -48,7 +48,7 @@ B0419123040526S15036253EA0000000000
 B0419433040646S15036334EA0000000000\r
 B0420133040794S15036367EA0000000000\r
 B0420443040707S15036367EA0000000000\r
-B0421143040678S15036423EA0000000000\r
+B0421143040679S15036423EA0000000000\r
 B0421443040658S15036414EA0000000000\r
 B0422153040772S15036358EA0000000000\r
 B0422453040722S15036423EA0000000000\r